change
Merge branch 'redhook_staticcontent' of https://github.com/opentechinstitute/Tidepools-Mobile into redhook_staticcontent

Conflicts:
	server.js