introductory c++ support
Merge branch 'origin/master'

Conflicts:
	src/Mnemonics.sln
	src/Mnemonics/Java.fs
	src/Mnemonics/Mnemonics.fsproj
	src/Mnemonics/Program.fs
	src/Mnemonics/Types.fs
	staging/Idea/.idea/uiDesigner.xml