first commit
Merge https://github.com/kvorak/EVERock