added code
added bin and data to gitignore
Merge branch 'master' of https://github.com/Faedrivin/datathonms2014

Conflicts:
	.gitignore