Competitive Programming additions
Deleted test file
Merge branch 'master' of https://github.com/sbaldrich/dotfiles

Conflicts:
	.bash_profile