Merging for presentation purposes.
Merge branch 'master' into cole
Just getting ready to merge.
Merge branch 'master' into cole

Conflicts:
	app/views/Users/create-edit.blade.php
	app/views/Users/landing.blade.php
Merge branch 'master' into cole
Merge pull request #31 from areveal/cole

Cole