Slight change to .gitignore
Removed artificats of screwed up .gitignore
Merge branch 'fixed-gitignore'
Locked
Looks like everything is working
Fixed some formatting on the lock
Working lock merged in
Merge branch 'working-lock-test2' into test_caset1
Had a small bug in the process.c file where the queue was not kept
Merge branch 'hotfix-keep-queue' into test_caset1