more type; added css dir to gitignore to avoid pointless conflicts
Merge branch 'master' of github.com:albumprinter/arc

Conflicts:
	css/foundation.css