Merge branch 'development'
Added note about building and running and changed default file name
Some shader fixes
start on project 3