login and logged in based auth
edit about page is done
bla
Merge branch 'edit_about' into develop

Conflicts:
	.gitignore
	main/about.pyc
	main/app.pyc
	main/models.pyc
remove stupid pyc files
skills
eh..
stupid pyc again
Merge branch 'develop'