Merge pull request #2 from asoper29/master

Yo dawg, I head you like angular
Merge pull request #3 from asoper29/development

Merge pull request #2 from asoper29/master