Remove HTML break
Misc

Super descriptive I know
Merge pull request #1 from gtdavidv/david

David
Add new combo on server side
Merge pull request #2 from gtdavidv/riaz

Riaz
Check for combo
Merge pull request #3 from gtdavidv/david

David
Merge pull request #4 from gtdavidv/master

Update branch
tmp file with code to set combo for first time
Merge pull request #5 from gtdavidv/david

David
The Design
More server side stuff...
I don't even know
Merge pull request #6 from gtdavidv/david

David
Merge branch 'master' into riaz
Added Set Combo