got rid of merge stuff in readme
Merge pull request #57 from tbrockman/master

going to bed
Added template
Merge pull request #2 from CMPUT301F14T03/master

updating my fork
Merge https://github.com/CMPUT301F14T03/lotsofcodingkitty

Conflicts:
	README.md
deleted temp files from main repo
cleaning up doc directory
Merge pull request #58 from rjynn/master

Deleted files no longer needed
Delete .~lock.Use Case Model.xlsx#
Merge pull request #59 from tbrockman/master

Merge pull request #2 from CMPUT301F14T03/master
Merge pull request #60 from tbrockman/master

merge test cases
Updated UML
Update UML
Dom and Carly changes
Merge pull request #61 from cchan5/master

Dom and Carly changes
Added storyboard, and UI diagrams
Merge pull request #62 from jivedesign/master

Added storyboard, and UI diagrams
added this to help our work
Merge pull request #63 from rjynn/master

added this to help our use case stuff
Added more test cases