Nexus log
Nexus added
Merge branch 'master' of github.com:yspark/2012Fall-818J

Conflicts:
	writeup/introduction.tex