delete uselses stuff
Merge branch 'master' of https://github.com/Educ8-2014/educ8-angular into feature/58-video
delete ds store
Merge branch 'feature/58-video'