from server merging
server merging
Merge branch 'master' of https://github.com/Doszhan/skipper
from_server for heroku
Merge branch 'master' of https://github.com/Doszhan/skipper