Added .DS_Store .gitignore

Signed-off-by: Waly Kerkeboom <me@waly.me>
Merge branch 'master' of https://github.com/waly-k/prj02
Merge attempt

Signed-off-by: Waly Kerkeboom <me@waly.me>
Merge branch 'master' of https://github.com/waly-k/prj02

Signed-off-by: Waly Kerkeboom <me@waly.me>

Conflicts:
	css/main.css
AddTrack, AddList function

Signed-off-by: Waly Kerkeboom <me@waly.me>