Merge branch 'master' of /Users/carllindiii/Google Drive/Fall 2014/CSC 486/todo with conflicts.