.gitignore now working
.gitignore now working
cleanup
Merge branch 'activeWork'
Merge branch 'activeWork'
Merge branch 'activeWork'
Merge branch 'activeWork'
Merge branch 'activeWork'
Testing lab 3
Merge branch 'master' into activeWork
Hopefully fixed the lab issues