Add forums
Remove diffs.txt
Merge branch 'master' into forums

Conflicts:
	db/schema.rb
Merge pull request #24 from austingulati/forums

Discussion Forums