Adding .idea/* to .gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
updated gitignore for ideas folder
added favicon
Merge branch 'master' of https://github.com/Rubbishman/rivl