Merge pull request #6 from nllptr/master

Some stuff
Stuff.
Stuff
Stuffs
4 and 5 done
6 done
Stuff
Lab6 commit
Cleaned up the repo.
Stuff
Also stuff
U7 done
Lab 6 done
Changed gitignore
Cleaned
Merge pull request #7 from gustavjp/master

Finished