commit before pull: layouts/application.html.erb
commit before pull: check conflict
Merge branch 'master' of https://github.com/minardi/SSTTv2-server
change url for get roles
commit after pull
Merge branch 'master' of https://github.com/minardi/SSTTv2-server
commit before push: change fikle application.html.erb