Merge branch 'master' of github.com:dopefishh/sws1

Conflicts:
	ass2/mart/sws1-s4109503-s4202015/exercise1d
	ass2/mart/sws1-s4109503-s4202015/exercise1d.c

diff --cc ass2/mart/sws1-s4109503-s4202015/exercise1d.c
index 93dba64,3200729..7555bc9
--- 1/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
--- 2/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
+++ b/ass2/mart/sws1-s4109503-s4202015/exercise1d.c
@@@ -1,6 -1,5 +1,5 @@@
 -#include <stdint.h>
 +#include <inttypes.h>
  #include <stdio.h>
- #include <stdlib.h>
  
  int main(void)
  {