my changes
Merge branch 'master' of https://github.com/buffym/hackettes-2013

Conflicts:
	app/assets/stylesheets/styles.css.scss.erb
popups