alfred, get me some chicken
Blah Blah Blah

hellloo
I'M BATMAN
Deleted my test files. No one can know of my presence
test
Batman has begun to work
Relocating
Added a new list in the schedule menu which creates a list of days and
added an event listener to this list. This framework will also be used
for the list of activities for each day....
Fixed crashing issue from toast in the event click listener
I don't know what I'm committing but these are some uncommitted changes
Bats in the cave. DisplayEventActivity created. Bats out of the cave.
asdfasdf
sitan is robin. he does no work. Also, displayEventActivity added
sitan has no balls. trying to commit everything
asdgasdf
asdf
A bunch of things
asdfasfdasdfsdf
Merge branch 'master' of https://github.com/kinglbf/FroshAndroidApp

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	gen/ca/skule/froshapplication/R.java
	res/values/strings.xml
	src/ca/skule/froshapplication/MainActivity.java
	src/ca/skule/froshapplication/MapActivity.java