change
Merge branch 'master' of github.com:irecep/reddit

Conflicts:
	.project
	.pydevproject
	r2/r2/lib/pages/pages.py