some tweaks
Merge branch 'master' of github.com:Venemo/css-fitness

Conflicts:
	phantom-inside.js