Alignment issues
Merge branch 'master' of github.com:FOSSRIT/surf-2013

Conflicts:
	README.rst
Merge branch 'master' of github.com:FOSSRIT/surf-2013

Conflicts:
	README.rst
Merge branch 'master' of github.com:FOSSRIT/surf-2013
Alignment changes