Merge pull request #4 from Josiastech/master

Clean all the mess ;)
Merge pull request #5 from Josiastech/Angular

Merge pull request #4 from Josiastech/master