Initial commit
Update README.md
Merge branch 'master' of https://github.com/uccgit/the-game

Conflicts:
	README.md
Create a new file
Update README.md
Testing a new file
Just a test

testing
OO Example

Just a quick little file to test the git!
Update README.md
Delete test.txt
this is something
Merge https://github.com/uccgit/the-game
Delete file1.txt
Delete file2.txt
Delete file3.txt
Merge branch 'master' into sandbox

Conflicts:
	README.md
Merge branch 'sandbox'
Update README.md
Update README.md
New Files Added