main page change
Merge branch 'master' into piotrek
Change devise erb to haml
gemfile.loc fix
Merge branch 'piotrek'