inital commit
Merge branch 'master' of https://github.com/matt-komm/titan
changed gitignore