Added the normal files
Merge branch 'master' of https://github.com/prheenan/csci5314_2014_conformation