replace complex files with html counterparts
fix the things
Merge branch 'master' of github.com:stickies/stickies.github.com

Conflicts:
	_posts/2013-5-21-playing-with-arel.html
tidy up