Initial commit
setup
Merge branch 'framework' of https://github.com/sebastian1118/motto

Conflicts:
	.gitignore
	.idea/compiler.xml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml