lol
Merge branch 'master' of https://github.com/jeremymeile/jeremymeile

Conflicts:
	gcc47test.sh