stuff
Merge branch 'master' of github.com:JGrubb/drunken-hearts
Merge branch 'master' of github.com:JGrubb/drunken-hearts
fixing merge
Merge branch 'master' of github.com:JGrubb/drunken-hearts
Gemfile?
Merge branch 'master' of github.com:JGrubb/drunken-hearts

Conflicts:
	.gitignore