oddhap lab1 submission#21

oddhap wants to merge 4 commits into

dat320-2014:masterdat320-2014/lab1:masterfrom

oddhap:masteroddhap/lab1:masterCopy head branch name to clipboard