do stuff
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular