idk what just happpened
commiting before merge
harded coded shit
Merge branch 'master' of github.com:czhu12/ams