views/groups to haml
Merge branch 'master' of https://github.com/netguru-training/social-network
rails 12 factor gem
fix conflicts