gitignore add
Merge branch 'master' of github.com:kikikiblue/eduroy

Conflicts:
	.gitignore
add rails project