Test commit
Update index.html
Update index.html
Update index.html
Update index.html
Update index.html
Update index.html
Update index.html
Delete old content
Merge branch 'master' of https://github.com/HotelQuickly/News

Conflicts:
	index.html
New default content
Improved layout
New photo server
Improved style
Create README.md
Create 2014-04-29-event-tracking.md
Improved style
Improved style
Improved style - bugfix
Improved style