Merge branch 'master' of https://github.com/josephktcheung/grasshopper

Conflicts:
	Gemfile.lock
Added Gemfile.lock to .git ignore
Merge pull request #9 from annieccheung/master

Temporarily ignore gemfile.lock