Nigel, testing commit
Removed test html code
Merge branch 'master' of heroku.com:giga-blab