Gemfile sorted
Wut?
Merge branch 'master' of github.com:ceramicsteve/exp1

Conflicts:
	.gitignore