spacing
Merge branch 'master' of https://github.com/wchamilton/funksh
gallery base animations
Merge branch 'master' of https://github.com/wchamilton/funksh

Conflicts:
	scripts/jquery.js