Merge branch 'origin/master'
old readme
Merge branch 'origin/master'

Conflicts:
	Assets/readme.txt
centerPanel:
- Changed JTabbedPane to 2 separate JPanels with icons on the left and TaskPanel on the right
- Arranged layout for the centerPanel
- Introduced class TaskPanel
Merge branch 'Vera'

Conflicts:
	Assets/readme.txt
	Code/assets/images/add_new.gif
	Code/assets/images/all_categories.gif
	Code/assets/images/house.gif
	Code/assets/images/school.gif
	Code/assets/images/work.gif
	Code/src/TimeManager/TimeManagerController.java
	Code/src/TimeManager/TimeManagerMain.java
	Code/src/TimeManager/TimeManagerModel.java
	Code/src/TimeManager/TimeManagerView.java
bb
Merge branch 'Aries'

Conflicts:
	Code/src/TimeManager/TaskCategory.java