New commit
Merge branch 'master' of https://github.com/MIBIGTeam/BIGNews

Conflicts:
	src/com/hackathon/bigteam/AddNews.java