commit before merge
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared
updated hero

hero and game arrays updated
Merge branch 'master' of https://github.com/jamesmichiemo/NJ_Squared

Conflicts:
	src/com/NJSquared/state/ArrayGameState.as
merged and working array game states