Fixing the web server project, uses pre's and styles
Merge branch 'master' of https://github.com/GoogleChrome/chrome-app-samples
Making it so that you can select a network interface in the webserver
Add sample to show how to use chrome.experimental.systemInfo API
Add pointerLock permission to webgl sample.
Simple fullscreen sample.
Removed conflict markers from .gitignore file.
Merge pull request #50 from sbermeister/master

Fixed a conflict marker in the .gitignore file
Update hello-world/styles/main.css

Fix a small bug. 
The background image "hello_world.png" was not loaded correctly.
The path should be "../hello_world.png" instead of "hello_world.png".
Merge pull request #51 from TuTu/patch-1

Fix a small bug in hello-world/styles/main.css
Update gdocs/main.html

Fixing the drive example to use Angular's CSP mode
Merge pull request #49 from hmin/systemInfo-sample

Add systemInfo API sample
Merge branch 'master' of https://github.com/GoogleChrome/chrome-app-samples
Add README.md file for systemInfo sample
Merge pull request #55 from scheib/webgl-pointer-lock-permision-2012-11-26

Add pointerLock permission to webgl sample.
Adding instagram example for 3rd party authentication
Merge branch 'master' of https://github.com/GoogleChrome/chrome-app-samples
Adding README to the Instagram demo.
added sample categorization
change header of app categorization