Responsive design
Merge branch 'master' of https://github.com/boyntonchang/AgapeChoir

Conflicts:
	server/config/express.js