SLETTA ALT!
Merge branch 'master' of https://github.com/VidyPie/Fantastic-Four
Merge remote-tracking branch 'origin/master'

Conflicts:
	MultikopterBygger/pktConfig.php
xcxc
Merge remote-tracking branch 'origin/master'

Conflicts:
	MultikopterBygger/index.html
	MultikopterBygger/katChoice.php
	MultikopterBygger/skjema.html
	MultikopterBygger/stylesheet.css