playing around...time to clean everything up and get serious
quick test for Webstorm
Merge remote-tracking branch 'origin/master'

Conflicts:
	_includes/themes/twitter/default.html
	assets/themes/twitter/bootstrap/img/noisy-texture.png
	index.md
still cleaning