integrating files
Merge branch 'master' of https://github.com/MattAttack/bh-seattle-2013

Conflicts:
	markmywords/markmywords/urls.py
hooked up goals to goals page