Revert "reset"

This reverts commit 7b082dfd70799db93915497855d211924bcf7cd3.
reset
Merge branch 'master' of https://github.com/vis2014/Assignment2

Conflicts:
	readme.md