Test calendar
Added dummy
Added test-cal.ics to htaccess
Added return in bottom of calendar
Proper return
EOL!!!
Eol fuckup
EOL fruckasada
Merge branch 'master' of github.com:sqren/freedom

Conflicts:
	.gitignore
	.htaccess
Merge branch 'master' of git.pagodabox.com:freedom
Merge branch 'master' of git.pagodabox.com:freedom

Conflicts:
	.gitignore
	README.md
	feed.php
Merge branch 'master' of github.com:sqren/freedom

Conflicts:
	.gitignore
	.htaccess