Add initial angularjs app
merge upstream and fix confilct
Merge pull request #1 from ahmdrefat/master

Add initial angularjs app