working. Just need to add to api
Merge branch 'business-majors' of https://github.com/dekhtyar/CSC366-Spring2013 into business-majors