Merge branch 'master' into Sean_Dev
Merge branch 'zacDev'
Merge branch 'zacDev'
Merge branch 'zacDev'
adjusted dog spawner to scale via time
Merge branch 'master' of https://github.com/brickman1444/LudumDare31
Merge branch 'master' into Sean_Dev

Conflicts:
	Assets/Scripts/dogSpawner.cs
Merge branch 'Sean_Dev'
Merge branch 'master' into zacDev