Added .DS_Store files to .gitignore
Merge branch 'master' of github.com:Harveynglish/freespace
Added when column to activities. Changed capacity_id to capacity on all forms
Fixed :confirmable for devise. Removed random thing from html file