Changes to be committed:
	modified:   main.cpp
	new file:   main.h
	new file:   sk1data.cpp
	new file:   sk1data.h
	modified:   skilverefni1.pro
Merge branch 'master' of https://github.com/Verklegtnamskeid1/Skilverefni1

Conflicts:
	main.cpp