No more api test errors
Merge branch 'GUIBranch' of https://github.com/hhrosvick/seng403-W2013 into GUIBranch