added some comments to testing
Merge remote-tracking branch 'upstream/master'
still working on testing the long clicks
Merge remote-tracking branch 'upstream/master'
Merge pull request #211 from iameric1986/master

Fixed the favorites saving that someone broke
stuff
Merge pull request #212 from rjynn/newBranch

merged my changes with erics
Merge pull request #213 from iameric1986/master

Fixed user posted save function
UI TESTS
Merge pull request #214 from pachalad/master

UI TESTS
UI TESTS
Merge pull request #215 from pachalad/master

UI TESTS
Fixed errors
Merge pull request #216 from pachalad/master

Fixed errors