Commit Graph

7 Commits

Author SHA1 Message Date
Marijn Jansen
17d1f96a02 Merge with current master 2017-01-11 11:14:07 +01:00
Marijn Jansen
b973e666da Fixed spacing on the chat page. 2017-01-10 20:58:56 +01:00
Marijn Jansen
81e4d1e874 Fixed for merge 2017-01-10 17:12:16 +01:00
Marijn Jansen
cf240ca656 Almost a chatpage! 2017-01-10 17:08:40 +01:00
Lars van Hijfte
f8d66720bd Added a header
Logo, searchbar without functionality and a profile picture. Also gave the content a margin downward because of the header.
2017-01-10 16:43:16 +01:00
Marijn Jansen
9c0d1b19f0 Merges css files 2017-01-10 15:09:14 +01:00
Lars van Hijfte
4da39d5bab This inserts the map structure we will use for the project. 2017-01-10 14:35:56 +01:00