trying to commit again
Merge pull request #9 from lyeary/master

wtf
Merge pull request #7 from farahfouladi/master

now?