Check for merge
Commit for merge
Can't update git
2nd try to update
Merge remote-tracking branch 'upstream/master'
Test Added

Unittest Feedback, Review, Answer finished
Merge pull request #12 from Belithraldor/master

Test Added
Merge remote-tracking branch 'upstream/master'
A little cleanup