Merge branch 'development'
Master: added project
Master: ignoring .idea/*
Master: updated to include shaders and camera