Allow for tags at the end of an event with square brackets, e.g. [job]
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html
Improved tags to look for the last square brackets, so markdown links etc. still work.
Fixed events without tags
Added .gitignore with config.json, life.md and phpstorm/webstorm project files
Added hashtags with a config to hide or show them
Moved tag classes to the .event div and prepended with "tag-"
Merge remote-tracking branch 'owens/master'

Conflicts:
	index.html