Changes to be committed:
	modified:   .ipynb_checkpoints/Defense-checkpoint.ipynb
	deleted:    Defense (tardis's conflicted copy 2014-02-15).ipynb
	deleted:    Defense.html
	modified:   Defense.ipynb
	new file:   Defense.ipynb.bk
	deleted:    Defense.slides (tardis's conflicted copy 2014-02-15).html
	modified:   Defense.slides.html
Merge branch 'master' of github.com:xguse/ipy_notebooks

Conflicts:
	.ipynb_checkpoints/Defense-checkpoint.ipynb
	Defense.ipynb
	Defense.slides.html
 Changes to be committed:
	deleted:    Defense.slides
	deleted:    Defense.slides.html