1 sucks

2 is so much chiller
Merge branch 'develop' of https://github.com/477Baseball/frontEnd.git into develop