fixing git subfolder thing so i can test other apps up in here
Merge branch 'master' of github.com:zackn9ne/wdi_project_1