moved things around
Merge branch 'master' of https://github.com/JDong820/EE319k