conclusion
Merge branch 'master' of https://github.com/rahmati/multiTierController

Conflicts:
proposal.pdf
Merge branch 'master' of https://github.com/rahmati/multiTierController

Conflicts:
	proposal.pdf