Cleaned up project to removed unneeded files
Merge branch 'jnguyenjr-working_2'