-
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
-
Merge remote-tracking branch 'origin/master'
changed problems with formatting in index, added shadows to the colored boxes in the rows
Merge remote-tracking branch 'origin/master'
added android spinner for loading occassions
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css