Initial commit
Merge branch 'master' of github.com:Shareyourstory/story

Conflicts:
	.gitignore