Merge pull request #3 from FlackAP/master

merging master into Flack
attempt to fix undefined errors
updated addToOrder function
Merge pull request #5 from FlackAP/flack

Flack