Merged upstream
Merge branch 'master' of git@github.com:zachberger/insults-app.git

Conflicts:
	src/edu/rit/se/agile/randominsultapp/RandomInsults.java