5 Commits

Author	SHA1	Message	Date
Marijn Jansen	916589dac7	Merge branch 'master' into marijn-chat	2017-01-11 14:04:53 +01:00
Marijn Jansen	eecdcad538	"before merge"	2017-01-11 14:04:04 +01:00
Lars van Hijfte	33a1c0502a	Added footer include	2017-01-11 13:04:23 +01:00
Marijn Jansen	b973e666da	Fixed spacing on the chat page.	2017-01-10 20:58:56 +01:00
Marijn Jansen	cf240ca656	Almost a chatpage!	2017-01-10 17:08:40 +01:00