Rebased and squashed commits

Rebased and squashed commits

Rebased and squashed commits

Rebased and squashed commits

Rebased and squashed commits

Rebased and squashed commits

Rebased and squashed commits
Merge branch 'master' of https://github.com/codergreen/ValyriaTear