add more things and stuff
Merge branch 'features/add-logs' of https://github.com/facultymatt/nodejs_data_mining into features/add-logs

Conflicts:
	app/scripts/app.js