some dat in master
some commit to change
test
test
ignore
test
added gitignore
this is a morning test
Merge branch 'master' of https://github.com/jinnashravan/Jeminee

Conflicts:
	.gitignore