merge
Merge branch 'master' of https://github.com/frmi/sw605f14-latex

Conflicts:
	documents/Sprint2/prototypes.tex