Remy Edits -- Move stuff
Merge branch 'master' of github.com:FOSSRIT/pyconposter

Conflicts:
	css_pycon_poster.svg
Remy Tweaks -- Merge Resolution Magic