Initial Setup
Merge branch 'master' of https://github.com/alfadaemon/o-rei