update to 1.2
remove misadded directory
Merge branch 'master' of github.com:haggen/resetize

Conflicts:
	resetize.css