Not sure if i'm committing the right files or everthing i need to
commiting everything i changed
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	config/routes.rb