removed lock file
Merge branch 'master' of github.com:Heydon/niace-stories-app
ad your story
removed empty template
Merge branch 'master' into 29/multi-themes

Conflicts:
	app/client/templates/content-templates.html