end of day 1
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	PollioProject/Pollio/src/main/res/layout/activity_main.xml
	PollioProject/Pollio/src/main/res/values/ids.xml
	PollioProject/Pollio/src/main/res/values/strings.xml
mc_poll, working on picture_poll
giving burka something to do!
giving burka something to do!
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/army-of-dumbledore/pennappsF13

Conflicts:
	PollioProject/Pollio/src/main/java/edu/upenn/cis/pennapps/pollio/BinaryPoll.java
added picturepoll.java and Image Adapter
Merge branch 'master' of https://github.com/army-of-dumbledore/pennappsF13