New stuff
Merge branch 'master' of https://github.com/liamste/First100DaysofAutism

Conflicts:
	First100DaysUI/www/partials/footer.html
Merge branch 'master' of https://github.com/liamste/First100DaysofAutism
Merge branch 'master' of https://github.com/liamste/First100DaysofAutism