added .gitignore
Merge branch 'master' into activeadmin

Conflicts:
	.gitignore