Josh's edit
Update TestFile.txt
Merge pull request #1 from tbrockman/patch-1

Update TestFile.txt
Adding my name to my edit
Eric's edit
updated Test.txt
deleted temp file
poked.
poke...
Update TestFile.txt
Added License file
Merge pull request #2 from cchan5/master

Added License file
Merge https://github.com/CMPUT301F14T03/lotsofcodingkitty
mock ER diagram