css stuffs

Signed-off-by: William Rockwood <wrockwood@tadl.org>
Merge branch 'master' of github.com:tadl/mobile-ios

Conflicts:
	www/css/main.css

Signed-off-by: William Rockwood <wrockwood@tadl.org>