fix bug
adding any final changes
Merge branch 'master' of https://github.com/HackathonLV/HackathonWeekend