Section 4 done
Merge branch 'master' of https://github.com/philipoe/ICRA2015_AtlantikSolar_Paper

Conflicts:
	.gitignore