Merge branch 'master' into nwalke-update_site_color

author Dan Brown <redacted>

Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)

committer Dan Brown <redacted>

Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)
author Dan Brown <redacted>
Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)
committer Dan Brown <redacted>
Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)
diff --cc app/Http/Controllers/SettingController.php
Simple merge
diff --cc resources/views/base.blade.php
Simple merge
diff --cc resources/views/settings/index.blade.php
Simple merge
author	Dan Brown <redacted>
	Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)
committer	Dan Brown <redacted>
	Sun, 6 Mar 2016 09:08:20 +0000 (09:08 +0000)
		1	2
app/Http/Controllers/SettingController.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/base.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history
resources/views/settings/index.blade.php	patch \|	diff1 \|	diff2 \|	blob \| history