Removed and recreated git repo
Reverted to non-scaletype version
Merge branch 'master' of github.com:vinaysshenoy/okulus

* 'master' of github.com:vinaysshenoy/okulus:
  Reverted to non-scaletype version
  Removed and recreated git repo

Conflicts:
	build.gradle
	okulus.iml
merge with master repo
ignore *.iml