update .gitignore
update .gitignore
Merge branch 'framework' of https://github.com/sebastian1118/motto

Conflicts:
	.gitignore
	.idea/workspace.xml
Merge branch 'framework' of https://github.com/sebastian1118/motto

Conflicts:
	.gitignore
	.idea/workspace.xml