Merge pull request #1 from jaredwindover/master

Continue the shit
Merge branch 'master' of local repository into Dev
Scrolling
Merge branch 'master' of https://github.com/jaredwindover/LoveLetters2.git