fist commit
y
Merge branch 'master' of https://github.com/sakulstra/photon

Conflicts:
	README.txt