small pre-pull commit
Merge branch 'master' of https://github.com/ArmandoMota/education-analysis-2014

Conflicts:
	notebooks/NB3_data_analysis.ipynb