ingore .yaml files
GitIgnore
Merge branch 'master' of https://github.com/thejasvibhat/smashed

Conflicts:
	MemeCreator/MEMEHTML/style.css