adam 2
Merge branch 'master' of https://github.com/chrisnorth/lookback

Conflicts:
	js/writeInps.js
Merge branch 'master' of https://github.com/chrisnorth/lookback

Conflicts:
	js/writeInps.js