ugh
merge fix
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume
Merge branch 'master' of https://github.com/mschmitt23/resume