Fix Commit Error

Error caused files to merge in an unexpected way, resulting in the loss
of files and therefore rendering the program to start.
Merge pull request #5 from ostngag/Rui

Fix Commit Error