Merge branch 'master' of https://github.com/jonasoesch/NRJ

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/jonasoesch/NRJ