deuxio/airbnc — pull request #14 by deuxio (2014-11-19 11:43:23+00:00)
Title: updates / fixes

resolve conflicts