no message
Merge branch 'master' of https://github.com/MIBIGTeam/BIGNews

Conflicts:
	src/com/hackathon/bigteam/ReadNews.java
Merge branch 'master' of https://github.com/MIBIGTeam/BIGNews
no message
Merge branch 'master' of https://github.com/MIBIGTeam/BIGNews

Conflicts:
	AndroidManifest.xml
	src/com/hackathon/bigteam/MainActivity.java
Merge branch 'master' of https://github.com/MIBIGTeam/BIGNews
no message