got rid of merge stuff in readme
Merge pull request #54 from cchan5/master

Added Gantt Chart
Deleted unneeded classes
Merge pull request #55 from pachalad/master

Deleted unneeded classes
added jpg
Merge pull request #56 from pachalad/master

added jpg
Merge pull request #1 from CMPUT301F14T03/master

Updating with master
3 test classes left before things should be able to run, restored some
files.
Update FavoritesTest.java
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#
test cases running
Merge pull request #59 from tbrockman/master

Merge pull request #2 from CMPUT301F14T03/master
adding updated test cases plz work