Merge branch 'master' of https://github.com/MichalTuleja/cloud-project

Conflicts:
	public_html/js/app.js
Merge branch 'master' of https://github.com/MichalTuleja/cloud-project