CS4153-Blue-Team/FBButlerIpad — pull request #1 by istansell (2014-12-02 05:27:14+00:00)
Title: Merge master into employee

Merge master into employee to try and resolve issues.