fixed nested resources in controllers, views, navbar
Modified views/css and refactored controllers
Merge branch 'master' into nested-resources

Conflicts:
	app/views/users/show.html.erb
Merge pull request #20 from gopher-snakes-2013/nested-resources

Nested resources and refactoring and some css