ADDED APP ICONS
Merge branch 'master' of https://github.com/sparkrevolutions/arithmetick2

# By Nick Cox (5) and Matthew Mcclatchie (2)
# Via Matthew Mcclatchie
* 'master' of https://github.com/sparkrevolutions/arithmetick2:
  INCREASED CLICKABLE AREA IN SLIDER MODE TO ENTIRE DIV INSTEAD OF JUST H3 TAG
  COMPLETED KEYPAD PAGE INCLUDING CHANGING THE FRAME RATE AND CLICKING BETWEEN THE FRAMERATES ON THE CALCULATOR.
  COMPLETED OPERATION AND FUNCTIONALITY IN THE KEYPAD SO THAT YOU CAN FULLY ADD AND SUBTRACT ASWELL AS UNDO UP TO 5 TIMES AND CLEAR
  FRONT END STYLING FOR CALCULATING MODE (OPTIONS AREA WHEN VALUES HAVE BEEN ENTERED)
  ADDED FUNCTIONALITY SO THAT THE USER CAN CHOOSE THE SPECIFIC TIME VALUE AND THEN  ALSO ADD UP THE TOTAL IN MILLISECONDS
  ADDED FUNCTIONALITY SO THAT WHEN THE  ADD OR SUBTRACT IS PRESSED THE ACTIVE STATE OF THE VALUE IS APPLIED
  CREATED FUNCTIONALITY FOR EACH OF THE KEYPAD BUTTONS

Conflicts:
	app/app.js
	cordova/platforms/ios/www/index.html
	cordova/platforms/ios/www/javascripts/app.js
	cordova/platforms/ios/www/javascripts/app.js.map
	cordova/platforms/ios/www/javascripts/vendor.js.map
	cordova/platforms/ios/www/stylesheets/app.css
	cordova/platforms/ios/www/stylesheets/app.css.map
	cordova/platforms/ios/www/test/javascripts/tests.js
	cordova/platforms/ios/www/test/javascripts/tests.js.map
	cordova/www/index.html
	cordova/www/javascripts/app.js
	cordova/www/javascripts/app.js.map
	cordova/www/javascripts/vendor.js.map
	cordova/www/stylesheets/app.css
	cordova/www/stylesheets/app.css.map
	cordova/www/test/javascripts/tests.js
	cordova/www/test/javascripts/tests.js.map
ADDED HAMMER LISTENER ON HOURS SLIDER

- Added listener for hours for continued development
- Reformatting of the view hierarchy will be needed for other panels to work