Merge pull request #48 from Sigf/master

small style changes
Merge pull request #49 from Sigf/master

style sheet organization
Merge pull request #51 from Sigf/master

Markers and Badges
Merge pull request #57 from Sigf/master

Markers Info Window
Update read-me with PCap install instructions.
Delete .test_pcap.py.swp
README update

Removes the blah blah and bleep bloops. Adds a description and a section for screenshots.
Adds picture and replace Outbreak with Birdseye
XMerge branch 'master' of https://github.com/CSUChicoSoftwareEngineering/outbreak

Conflicts:
	README.md
merged from upstream