new branch
Add events calendar
resolve merge conflicts
Merge pull request #49 from Cynaria/calendar

Calendar
Add calendars
Merge pull request #50 from Cynaria/calendars

Add calendars
Calendar links
Merge pull request #51 from Cynaria/calendars

Calendar links
merge conflicts fixed
fix merge flixx again
Merge pull request #52 from Cynaria/sassy

there might be a weird AJAX remote in comment form
changed spacing layouts
Merge branch 'master' into spacing_adjustments
Merge pull request #53 from Cynaria/spacing_adjustments

Spacing adjustments
more spacings
Merge branch 'master' into spacing_adjustments
Merge pull request #54 from Cynaria/spacing_adjustments

Spacing adjustments
Did some ajaxy stuff
Fixed conflicts but now ajax is off