First commit. Not functional yet
Merge branch 'master' of http://github.com/twissell-/Cixta