Merge branch 'master' of /Users/norberg/Documents/SeniorProject/MonsterCheckout with conflicts.
25: Gave welcome page its own html file