hackathon birdstrikes
Merge branch 'master' of github.com:CSCI-4830-002-2014/CSCI-4830-002-2014.github.io