updated files
Merge branch 'master' of github.com:LogTyl02/LoamStory