push
Merge branch 'master' of github.com:christine06/2sided

Conflicts:
	js/main.js