Merge pull request #3 from janm399/master

Better AngularJS app