fixing bug
Merge branch 'master' of https://github.com/mreid1130/fallaway

fixing conflicts