adding a calc function to do math from the command line
Merge branch 'master' of github.com:vanjoe/init_files

Conflicts:
	.bashrc