Merge branch 'master' of https://github.com/g-szabo/demoCRAYcy

Conflicts:
app.rb
ignore