:added ipad
Merge branch 'master' of https://github.com/achaplinnews/kanban

Conflicts:
	index.html