Made teh app crash yo.
Merge branch 'master' of ssh://github.com/danielfinke/cpsc472