Border changes
Merge branch 'master' of https://github.com/Tarwine/4715Project