Weird change to Gemfile.lock, no idea why this is needed but it is.
Merge remote-tracking branch 'upstream/master'
Added aqeel's changes.
Merge pull request #49 from maxluzuriaga/aqeels-changes

Aqeel's changes