mods
Merge branch 'master' of github.com:icfaust/TRIPPy
stuff edited. I am drunk and I don't care