Forgot to commit a change in the triangulate function
Merge branch 'master' of github.com:valentinp/aer1513project
Merge branch 'master' of github.com:valentinp/aer1513project
Merge branch 'master' of github.com:valentinp/aer1513project
Minor report changes