removed mistakenly committed Build directory
added Build to .gitignore
removed workspace and user files
added workspace and user files to .gitignore
fixed build errors from bad merge
fixed build errors from bad merge
fixed tests not running