Initial commit of assignment 3 - a mashup
Fixed an issue where invalid names caused an uncaught exception
Merge branch 'Assignment-3'