Adding file to doc dir
Merge branch 'master' of https://github.com/gramirezualberta/Team04Project

Conflicts:
	TestFile.txt
Merge branch 'master' of https://github.com/gramirezualberta/Team04Project
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project into new
Add example of UI
Create .gitignore
updating UImock
Merge branch 'master' of https://github.com/CMPUT301W14T04/Team04Project