resolved unmarked git conflict
added links to every included module in the beginning of the file
Merge branch 'master' of https://github.com/kframework/k

Conflicts:
	src/javasources/KTool/src/org/kframework/kompile/KompileOptionsParser.java
Merge branch 'master' of https://github.com/Multiball/k