- Timeline Styles angepasst
- Pics und Timeline
Merge branch 'master' of https://github.com/lschomann/ducking-hipster

Conflicts:
	routes/data.js