Added the functions, made the code pretty
Merge branch 'master' of https://github.com/learnability/neophyte

Conflicts:
	calc.c