added Puma conf
nginx adjusted for puma
added Puma conf
merged with master
Merge pull request #306 from zaiste/puma-server

Puma server