Delete Movement.cs
Delete WaterCollision.cs
Merge branch 'master' of https://github.com/PokemonNxtDevStudio/Test

# By PokemonNxt
# Via PokemonNxt
* 'master' of https://github.com/PokemonNxtDevStudio/Test:
  Delete WaterCollision.cs
  Delete Movement.cs

Conflicts:
	Assets/Cody's Changes/Movement.cs
	Assets/Cody's Changes/WaterCollision.cs