commiting
conflict resolved
d
Merge branch 'master' of github.com:Educ8-2014/educ8-angular
Merge branch 'master' of github.com:Educ8-2014/educ8-angular
added schedule info
Merge branch 'master' of github.com:Educ8-2014/educ8-angular