implemented quadratic
Fixed integer casting
implemented factorial
space deleted
Merge branch 'olis_branch'
making it suboptimal
yet another possibility
Merge branch 'renes_branch' into mast0r

Conflicts:
	factorial.py