Merge commit '8203be421cf5664c4df86aefaabf258cd74dc919'
Merge commit '182507aa310e1e0a21b96ef96fb8ac2cdb73f0e3'
Create gh-pages branch via GitHub
Merge commit 'c1b8b2400593ba7b9123e066c4b4ed20dab8ddb4'
no message
Merge branch 'master' of https://github.com/outer89/introsde2013

Conflicts:
	lab2/Example2/quickstart/build.xml