Fixing major bug...
Merge branch 'master' of https://github.com/nlubczynski/DesignProject.git