Only include solutions
Merge branch 'master' into solutions

Conflicts:
	comments/comments.jsx
Remove stupid files
Ignore more stupid files