First commit, nothing major

https://github.com/TheIronYard--Orlando/FEE--2014--FALL/issues/306