Finish layout and routes
Made a basic User model (include secure passwords)
Merge branch 'master' of github.com:RickCSong/sample_app

* 'master' of github.com:RickCSong/sample_app:
  Finish layout and routes

Conflicts:
	spec/requests/static_pages_spec.rb
	spec/requests/user_pages_spec.rb