Just new stuff
Merge branch 'master' of https://github.com/vcnickerson/SkyNetHackathon
just finalizing
Merge branch 'master' of https://github.com/vcnickerson/SkyNetHackathon