more documentation
Merge branch 'master' of github.com:ganzm/AdvancedSystemsLab2013

Conflicts:
	doc/milestone1/milestone1.tex