Initial commit
Merge branch 'master' of https://github.com/Pyro-San/AquaPi

Conflicts:
	.gitignore