Resolved conflicts from @Tooblippe's last merge
Added README
Merge pull request #1 from walterl/master

Resolved conflicts and added README