Worked on ConceptDemo.fla

Signed-off-by: Arthur R. Wuterich <arthurwut@gmail.com>
Merge branch 'master' of https://github.com/zgthompson/pockwester

Conflicts:
	flash/concept/ConceptDemo.fla
	flash/concept/ConceptDemo.swf
	flash/concept/Fade.as