Merge branch 'develop'

Conflicts:
	css/main.css
	index.html
	js/TodoObject.js
	js/app.js
Create test_localStorage

created and retrieved a test object in localStorage.
Update test_localStorage
Update test_localStorage
added return for retrieving local storage
changed to javascript ifle
Merge branch 'troy_localStorage' into develop

Conflicts:
	css/main.css
	index.html
	js/TodoObject.js
	js/app.js