Update gemfile
Merge branch 'master' of https://github.com/jamesfzhang/adayat

Conflicts:
	Gemfile