Updated associations page
Merge branch 'master' into justin
Updated landing page and users database
Merge branch 'master' into justin
Merge pull request #46 from areveal/justin

Justin
Fixed div problems.
Merge branch 'master' of github.com:areveal/capstone
Merge branch 'master' into william

Conflicts:
	app/views/Users/show.blade.php