Changes to be committed:
	deleted:    src/elev.d
	deleted:    src/elev.o
	deleted:    src/heis
	deleted:    src/io.d
	deleted:    src/io.o
	deleted:    src/main.d
	deleted:    src/main.o
 Changes to be committed:
	modified:   src/channels.h
	modified:   src/heisstyring.h
	modified:   "src/k\303\270modul.h"

 Changes not staged for commit:
	deleted:    src/Makefile~
	modified:   src/channels.h
	new file:   src/heis
	modified:   src/heisstyring.h
	modified:   "src/k\303\270modul.h"
	modified:   src/Makefile
	modified:   src/elev.h
	new file:   src/eventManager.c
	modified:   src/eventManager.h
	new file:   src/heisstyring.c
	modified:   src/heisstyring.h
	new file:   "src/k\303\270modul.c"
	modified:   "src/k\303\270modul.h"
	modified:   src/main.c
	new file:   src/timer.c
	modified:   src/timer.h
Merge git://github.com/Lunarage/elevproj-ntnu

derpderp