Merge pull request #4 from IanGlascock/erica

png arts
Changes
Merge pull request #5 from IanGlascock/Ian_Branch

Changes
Merge branch 'master' of https://github.com/IanGlascock/FinalProject_v2 into erica

Conflicts:
	Assets/scripts/proc_gen.cs