Revert "I hate HEAD errors"

This reverts commit dfa303003fba5e3dc364946070400f3028145548.
Revert "Merge branch 'master' of https://github.com/cdchris12/CS-363-Fall-2013-Project"

This reverts commit 4e5d199af3a1fdf744ddc1f15c1143187c6bbca2, reversing
changes made to 9785145be5c0ba1210e656dc755d2fafc97de26a.
Rolling back