Updated for Spring 2014
Merge branch 'master' of https://github.com/UTexasMAD/iOS