Resolved merge conflicts
Fixed merge conflict
Fix merge conflcit
Merge branch 'master' of git://github.com/theonicolaou/ubiq
Merge pull request #5 from akbardhedhi/master

Fixes for merge conflicts