changed settings for oauth
changed settings for oauth
changed settings for oauth
put directions in the div instead of the heading
fixed login link
began working on js to allow for editing lesson elements
continued work on edit elements
major rehaul on how the formset is set in order to have more fexibility woth ordering, and editing the elements
major rehaul on how the formset is set in order to have more fexibility woth ordering, and editing the elements continued (pretty much finished
major rehaul on how the formset is set in order to have more fexibility woth ordering, and editing the elements continued (pretty much finished
added logos to login
Merge branch 'sprite'

Conflicts:
	apps/create_lesson/templates/create_lesson/create.html
basically finshed refocatring to alow edits and reordeing of elements
basically finshed refocatring to alow edits and reordeing of elements
basically finshed refocatring to alow edits and reordeing of elements
basically finshed refocatring to alow edits and reordeing of elements
basically finshed refocatring to alow edits and reordeing of elements
basically finshed refocatring to alow edits and reordeing of elements
began alowing for robust search capaabilities trying to reverse engineer some of youtubes search concepts
continued work on the search capabilities need to work on the time element