Deploy to Heroku
Merge branch 'heroku'
Merge conflict resolution
Merge branch 'master' of github.com:aphuong/On-Board

Conflicts:
	Gemfile