timeline stuff
Merge branch 'master' of https://github.com/fitany/HowWasYourDay

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/HowWasYourDay.apk
	bin/classes.dex
	bin/classes/edu/berkeley/cs160/howwasyourday/AddComment$1.class
	bin/classes/edu/berkeley/cs160/howwasyourday/AddComment$2.class
	bin/classes/edu/berkeley/cs160/howwasyourday/AddComment.class
	bin/classes/edu/berkeley/cs160/howwasyourday/DrawDoodle.class
	bin/classes/edu/berkeley/cs160/howwasyourday/R$drawable.class
	bin/classes/edu/berkeley/cs160/howwasyourday/R$id.class
	bin/classes/edu/berkeley/cs160/howwasyourday/R$layout.class
	bin/classes/edu/berkeley/cs160/howwasyourday/R$menu.class
	bin/classes/edu/berkeley/cs160/howwasyourday/R$string.class
	bin/classes/edu/berkeley/cs160/howwasyourday/R$style.class
	bin/classes/edu/berkeley/cs160/howwasyourday/Timeline.class
	bin/classes/edu/berkeley/cs160/howwasyourday/User.class
	bin/resources.ap_
	gen/edu/berkeley/cs160/howwasyourday/R.java
	src/edu/berkeley/cs160/howwasyourday/AddComment.java
	src/edu/berkeley/cs160/howwasyourday/User.java
timeline