DS_Store shizzl
Merge branch 'footable'

Conflicts:
	.DS_Store
just a little styling
Merge branch 'master' into footable