learning git stuff
Merge branch 'master' of https://github.com/sagebell/TeamEpic
learning git round 2
Merge branch 'reid_script_update'