10/14/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/tmpl/instructor_home.tmpl
Merge branch 'master' of https://github.com/cdaniel84/Sandbox-Repository

Conflicts:
	src/mobify.konf
	src/style.css
	src/tmpl/_header.tmpl