testing Codeship.io
Merge pull request #3 from drossellat/sample_build

testing Codeship.io
testing..
testing codeship :cheese:
fixing merge conflict
testing staging deployment
Merge pull request #5 from drossellat/master

merging production to master