fucking stupid bitches
Merge branch 'master' of https://github.com/zachberger/insults-app

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