added integer class
conflicts

Merge branch 'master' of https://github.com/iamamutt/mejr

Conflicts:
	R/general.R