Commit after moving from code.google.com
Merge branch 'master' of https://github.com/XinyueZ/minNews

Conflicts:
	.gitignore