Added documentation
Moved documentation around
Fixed makefile
Merge pc6
pc6 graded 2014.02.13