-Added section about inliner
Merge branch 'master' of github.com:phile314/mcco-projects

Conflicts:
	project2/doc/Doc.tex