initial commit
Merge branch 'develop' of https://github.com/cctina/railsgirls

Conflicts:
	.gitignore