Finished the horizontal category scrolling.
Merge branch 'master' of https://github.com/davidcosborn/portfolio

Conflicts:
	TODO