Update on test.py
increasing number of albums on Home page, re-fixing vertical image or indentation issue/
Resolve conflicts.
Fixing merge conflict. merge remote-tracking branch 'upstream/master'

Conflicts:
	mysite/mysite.db
	mysite/mysite/settings.pyc
	mysite/photo/models.pyc
	mysite/photo/smugmug.pyc
	mysite/photo/urls.pyc
	mysite/photo/views.pyc