added iso
Merge branch 'iso1'
Merge branch 'master' of https://github.com/dp6ai/flapjack

Conflicts:
	app/views/layouts/application.html.erb
fixing git issue