Initialize repository
Merge branch 'master' of https://github.com/tonychunwei/answer_machine

Conflicts:
	Gemfile
Update