alaska is on here
Merge branch 'master' of https://github.com/caseymm/pearlhacks

Conflicts:
	assault_app/views.pyc
	blog.db
kris's scrapes