add
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker into testingapp
Merge branch 'testingapp' of https://github.com/MC-Timetracker/timetracker
Updated UI
Merge branch 'timetrackerUI' of https://github.com/MC-Timetracker/timetracker into testingapp
time recorder
add
Merge branch 'master' of https://github.com/MC-Timetracker/timetracker into timetrackerUI

Conflicts:
	res/layout/activity_main.xml
	src/iiitd/mc/timetracker/MainActivity.java
add
added activities
add drawables
add menu
add src
add changes
Merge branch 'timetrackerUI' of github.com:MC-Timetracker/timetracker

Conflicts:
	res/layout/activity_main.xml
	res/values/strings.xml
	src/iiitd/mc/timetracker/MainActivity.java
Merge branch 'master' into listRecordings

Conflicts:
	src/iiitd/mc/timetracker/MainActivity.java
cleanup
push manifest file
renamed "List_Recordings" to "ListRecordingsActivity"
added simple toString for Recording