temp: switch between API servers
Merge branch 'master' of https://github.com/cbfranklin/emuseum-app

Conflicts:
	js/app.js