added some stuff
Merge branch 'master' of https://github.com/matthewgrossman/PollDance

Conflicts:
	PollDance/src/main/java/com/grahamp1/polldance/Answer.java
	PollDance/src/main/java/com/grahamp1/polldance/Question.java