spped up

sppesd up
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.txt
Merge branch 'master' of https://github.com/Addeo/test

Conflicts:
	page--front.tpl.php