Update bower.json
Merge pull request #7 from jaredmaxwell/patch-1

Update bower.json
bower
Merge remote-tracking branch 'origin/moki' into moki

Conflicts:
	bower.json
Merge branch 'moki' of https://github.com/j-walker23/ng-boilerplate-client-modules into moki

Conflicts:
	bower.json