New assets
More assets
Merge branch 'master' of https://github.com/paulaluri/Feuds

Conflicts:
Feuds/Assets/Scripts/UI/CameraMove.cs