Finished hacks list integration
Merge branch 'master' of https://github.com/greird/shacks
Conflicts:
	index.html

"fixed conflicts"