stuff
Merge branch 'master' of github-my:mindreframer/ng-slides
Merge branch 'master' of github-my:mindreframer/ng-slides