conflict
Adding angularjs
Merge remote-tracking branch 'origin/New-Awesome-Feature' into New-Awesome-Feature

Conflicts:
	README.md
Solve merge problems. fixed #7
Merge pull request #6 from VictorCabello/New-Awesome-Feature

New awesome feature