Before presentation
Merge branch 'master' of https://github.com/mauricedb/Techorama2014

Conflicts:
	Techorama2014/NaiveBooksSpa.html
Remove assemblies