Rspec test: Routing, User Model, User Controller
removed from repo test app log files and added to .gitignore
Fixed typos
Merge branch 'ruby_2.1.1_rails_4.0.10_v3' into ruby_2.1.3_rails_4.1.6

Conflicts:
	.gitignore