Change in settings
inte
Merge https://github.com/ggueno/projecteel

Conflicts:
	core/models.pyc
	db.sql
	projecteel/settings.pyc
Start project integration
Inte forms
gitignore conflict
gitignore conflict
profile pic is back in the comment template
integration form elements
integration form elements
integration form elements
Merge https://github.com/ggueno/projecteel

Conflicts:
	core/models.pyc
	db.sql
	projecteel/settings.pyc
test commit
merge shit'
Added Ds_store files to gitignore