bug fixed
fixed conflicts
Merge pull request #100 from Mattsface/master

Fixed the owner bug