Merge branch 'master' of https://github.com/aabecker/SwarmControlSandbox

Conflicts:
	papers/shiva/WeeklyReport/weeklyreport1.pdf