added lots o stuff
Merge branch 'master' of github.com:therebelrobot/trr-mar14