gg
gg
Merge branch 'master' of github.com:sleeping-lion/soojung

Conflicts:
	.gitignore
	Gemfile.lock
gg
gg
gg
gg