Merge branch 'master' of https://github.com/betzah/Flamingo

# Conflicts:
#	Assets/Scenes/Lorenzo.unity
