initial commit
Merge branch 'master' of https://github.com/kabads/zoomr

Conflicts:
	LICENSE
initial commit