before merge
Merge branch 'master' of https://github.com/zouster/app1
merge with roger to check errors
final touches pending photoshop and logo
Merge pull request #11 from manaj999/master

final touches pending photoshop and logo