Merge branch 'master' of heroku.com:kicksight
adding angular directories
Merge remote-tracking branch 'origin/master'