added development log to gitignore
Merge branch 'master' of https://github.com/evagabriela/techwomen into calendar

Conflicts:
	.gitignore
	log/development.log
	tmp/cache/assets/D38/540/sprockets%2F86e1ad844bc9df4491a2a52b870421db
	tmp/cache/assets/DDE/420/sprockets%2Ffb8b186d5bf0307f86f65fc787d2adeb
renamed calendar to event as to keep logic
conflict
fixed merge conflict