2
Merge branch 'master' of https://github.com/jpm7502333/precourse_app

Conflicts:
	bin/bundle
	bin/rails
	bin/rake
	bin/spring

quit
quit