Merge pull request #15 from kidaki/master

Adding David's game ideas
First pass of idea
Merge pull request #16 from dipsticker/master

First pass of idea
Some notes from class!
Merge remote-tracking branch 'upstream/master'
Encryption mock
Delete Business Model Canvas notes.java
Delete popup.js
Merge pull request #18 from new4931/master

Encryption Mockup
Got button listeners to work. Needed to put the script tag at the bottom of the page...
Merge branch 'master' of https://github.com/new4931/ragingDipsticks
Merge pull request #19 from new4931/master

Whoohoo! Got the button listeners to work...!
Some small progress I got done while at work. I'll hit this again tonight and then email everyone on Saturday morning with more of what needs to get done.
Merge pull request #20 from SonOfLysander/master

Some small progress I got done while at work. I'll hit this again tonigh...
Progress. Slow yet good progress.
Merge pull request #21 from SonOfLysander/master

Progress. Slow yet good progress.
OMG. Duh. Fixed JS checked issue.
HA! didn't need a JS or JQ fix. It was an error in CSS because of something I tweaked incorrectly. Tabbed Popup - FIXED
Merge pull request #22 from SonOfLysander/master

Updated popup, the second.
Disabled output textfield.