Adds Gemfile.lock
Gemfile.lock is added
Pull down to merge necessary due to file-removal clean up commits.
Merge branch 'master' of heroku.com:rubegoldberg
Informalizes HelloUser module by displaying first name only
Merge pull request #49 from tleung999/Hellofix

Informalizes HelloUser module by displaying first name only
Merge pull request #48 from tleung999/tuesday_night

Tuesday night
adds better song, better at least for now, maybe permanant.
Merge branch 'master' of https://github.com/tleung999/simplicity into betterSong

Conflicts:
	public/index.html
Merge pull request #50 from tleung999/betterSong

adds better song, better at least for now, maybe permanant.
Merge branch 'master' of heroku.com:rubegoldberg
fixes bug in helloUser that caused crash w/out loggin
Merge pull request #51 from tleung999/buggyfixy

Buggyfixy
add twilio modules, fixed google map, add supermarket catastrophe transition, merged with current master