working with foundation
Merge branch 'master' of github.com:PoorlyWritten/django-mailbot

Conflicts:
	foundation/index.html
	foundation/sass/app.scss
	foundation/stylesheets/app.css