First commit
Merge branch 'master' of github.com:volpino/facebook_hacker_cup

Conflicts:
	.gitignore