Did stuff and what
Merge branch 'master' of https://github.com/Alfandorachk/330Team4