I change things
FFFF
I hate git with a passion

Conflicts:
	app/src/main/java/edu/cwru/eecs393/canvas/BrowseMenu.java
	app/src/main/java/edu/cwru/eecs393/canvas/ServerWhisperer.java
	app/src/main/java/edu/cwru/eecs393/canvas/UserDAO.java