conflict with Michel's rspec
Merge branch 'rspec' of github.com:JonJagger/cyberdojo
start dialog conflict
last of html aligns moved to CSS