Merged boilerplate
Added Angular.js to project
Merge