Merge pull request #6 from boersmamarcel/develop

Fixen
Merge pull request #7 from boersmamarcel/develop

Travis build fixed
Update README.md
Merge pull request #9 from boersmamarcel/develop

Adds rspec
Update README.md

Add gemnasium
Merge pull request #21 from boersmamarcel/develop

Capistrano deployment script
Deploy test
Deploy fix
Deploy fix
Merge pull request #22 from boersmamarcel/master

Merging changes master to develop