Getting rep up to date with production site.
Merge branch 'master' of https://github.com/joshua-lane/code_lane

Conflicts:
	code_lane/__pycache__/settings.cpython-34.pyc
	code_lane/__pycache__/urls.cpython-34.pyc
	code_lane/settings.py
	db.sqlite3
	media/images/favicon.ico
	projects/__pycache__/models.cpython-34.pyc
	projects/__pycache__/views.cpython-34.pyc
	projects/models.py
	projects/static/css/bootstrap-social.css
	projects/static/css/bootstrap-theme.css
	projects/static/css/bootstrap-theme.css.map
	projects/static/css/bootstrap-theme.min.css
	projects/static/css/bootstrap.css
	projects/static/css/bootstrap.css.map
	projects/static/css/bootstrap.min.css
	projects/static/css/cover.css
	projects/static/css/font-awesome.css
	projects/static/fonts/fontawesome-webfont.eot
	projects/static/fonts/fontawesome-webfont.svg
	projects/static/fonts/fontawesome-webfont.ttf
	projects/static/fonts/fontawesome-webfont.woff
	projects/static/fonts/glyphicons-halflings-regular.eot
	projects/static/fonts/glyphicons-halflings-regular.svg
	projects/static/fonts/glyphicons-halflings-regular.ttf
	projects/static/fonts/glyphicons-halflings-regular.woff
	projects/static/img/bootstrap-social.png
	projects/static/img/favicon.ico
	projects/static/js/bootstrap.js
	projects/static/js/bootstrap.min.js
	projects/static/js/docs.min.js
	projects/static/js/jquery.min.js
	projects/static/projects/css/bootstrap-social.css
	projects/static/projects/css/bootstrap-theme.css
	projects/static/projects/css/bootstrap-theme.css.map
	projects/static/projects/css/bootstrap-theme.min.css
	projects/static/projects/css/bootstrap.css
	projects/static/projects/css/bootstrap.css.map
	projects/static/projects/css/bootstrap.min.css
	projects/static/projects/css/cover.css
	projects/static/projects/css/font-awesome.css
	projects/static/projects/fonts/fontawesome-webfont.eot
	projects/static/projects/fonts/fontawesome-webfont.svg
	projects/static/projects/fonts/fontawesome-webfont.ttf
	projects/static/projects/fonts/fontawesome-webfont.woff
	projects/static/projects/fonts/glyphicons-halflings-regular.eot
	projects/static/projects/fonts/glyphicons-halflings-regular.svg
	projects/static/projects/fonts/glyphicons-halflings-regular.ttf
	projects/static/projects/fonts/glyphicons-halflings-regular.woff
	projects/static/projects/img/bootstrap-social.png
	projects/static/projects/js/bootstrap.js
	projects/static/projects/js/bootstrap.min.js
	projects/static/projects/js/docs.min.js
	projects/static/projects/js/jquery.min.js
	static/css/bootstrap-social.css
	static/css/bootstrap-theme.css
	static/css/bootstrap-theme.css.map
	static/css/bootstrap-theme.min.css
	static/css/bootstrap.css
	static/css/bootstrap.css.map
	static/css/bootstrap.min.css
	static/css/cover.css
	static/css/font-awesome.css
	static/fonts/fontawesome-webfont.eot
	static/fonts/fontawesome-webfont.svg
	static/fonts/fontawesome-webfont.ttf
	static/fonts/fontawesome-webfont.woff
	static/fonts/glyphicons-halflings-regular.eot
	static/fonts/glyphicons-halflings-regular.svg
	static/fonts/glyphicons-halflings-regular.ttf
	static/fonts/glyphicons-halflings-regular.woff
	static/img/bootstrap-social.png
	static/img/favicon.ico
	static/js/bootstrap.js
	static/js/bootstrap.min.js
	static/js/docs.min.js
	static/js/jquery.min.js