Ignore main.css
Merge branch 'develop' of https://github.com/kepennar/personal_page into develop

Conflicts:
	app/css/main.css