gitignore
Merge branch 'develop'
[TASK] - Testing with nom
Added Readme
Typo in package.json
[TASK] - Install grunt cli on travis
Anführungszeichen
[TASK] - only lint javascript files in the app folder
[TASK] - typo in the gruntfile
Typo again
Remove test code
Merge remote-tracking branch 'origin/develop'

Conflicts:
	README.md