initial git file, unicorn configuration, first app load
Merge remote-tracking branch 'origin/master'