tweaks to new things
Merge branch 'master' of https://github.com/scobban/testrepo

Conflicts:
	important.html