Changed the SQL statements for UserDAO
Merge branch 'master' of https://github.com/Zerith90/IS480

Conflicts:
	src/main/java/DAO/TweetDAO.java