layout

needs function for time and tabs
Merge pull request #10 from SCS-hackers-group/bav

layout
Merging conflicts from master