updates from mike
Merge branch 'master' of github.com:CAH-JeffreyNorder/hackathon