Finished lab one
Merge branch 'activeWork'
Start lab 2
Added a git ignore file
Redid the projects
Fixed launch activity
Merge branch 'activeWork'