asd
Merge branch 'master' of https://github.com/lucaskz/DemoSoft

Conflicts:
	DomoticaProject/src/application/Main.java