layout links
Layout Links
new users controller
Merge branch 'master' of https://github.com/legalcodes/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
trying to merge
final merge attempt