initial commit
Merge branch 'master' of github.com:RailsWeek2014/Blogg

Conflicts:
	.gitignore