reformatted the vgadriver
Merge branch 'master' of github.com:E100-PEAR/e100

Conflicts:
	drivers/vga.e
Merge branch 'master' of github.com:E100-PEAR/e100
removed the stupid ">>>>>>>HEAD" line that was preventing vga.e from assembling