Transferring blueprint from apiary.io
Merge branch 'master' of https://github.com/nonsense/api_blueprint_test

Conflicts:
conflict.