Fixed most file stuff :)
Merge branch 'master' of https://github.com/ldowson/cs140winter2014
ONLY 8 FAILING BITCHEZZZZZ