get / to index.haml
Merge branches 'styles' and 'master'