Added .gitignore with config.json, life.md and phpstorm/webstorm project files
Added hashtags with a config to hide or show them
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	.gitignore
Fixed with new hashtags