Merge branch 'master' into cole
Merge pull request #16 from areveal/cole

Cole
removed .. from script paths checking function of login and reset views
Merge branch 'master' into william

Conflicts:
	app/views/layouts/master.blade.php
	app/views/users/login.blade.php
Merge pull request #17 from areveal/william

William
Merge branch 'master' into cole
Updated create blade and created edit blade.
Merge branch 'master' into justin

Conflicts:
	app/views/Users/create.blade.php
	app/views/layouts/master.blade.php
Merge pull request #18 from areveal/justin

Justin
Merge branch 'master' into cole
Updated edit blade to have two divs, the create profile and the associations div
Merge pull request #19 from areveal/justin

Updated edit blade to have two divs, the create profile and the associat...
Working on Users Show View and Database.
Merge branch 'master' into cole
Reconfigured the database and models for many to many relationships.