modify migration to adapt pg database
modify migration to adapt pg database
modify
modify omniauth_github
reset .gitignore
Merge pull request #21 from bay6/feature/heroku

Deploy on heroku
Merge branch 'master' of github.com:bay6/preunion into feature/mission

Conflicts:
	.gitignore
	Gemfile.lock