initial
Merge github.com:espehel/TDT4100Spring2014