Add scaffolding to client
Fix merge conflicts
Angular loading error
Merge pull request #13 from vreddy18/master

Error in angular loading