Quincy Larson 1df962bb07 Merge branch 'master' into staging ...

Conflicts:
	controllers/resources.js
	public/js/main_0.0.2.js
	seed/challenges/advanced-bonfires.json
	seed/challenges/basic-bonfires.json
	seed/challenges/get-set-for-free-code-camp.json
	server/views/partials/navbar.jade

2015-06-24 07:19:54 -07:00

..

css

futher improve calculator ux

2015-06-16 12:32:12 -07:00

fonts

remove CDN call for bootstrap and font awesome and get them loading locally

2015-03-06 23:56:22 -08:00

images

start redesign with new logo

2014-11-07 13:25:08 -08:00

js

Merge branch 'master' into staging

2015-06-24 07:19:54 -07:00

browserconfig.xml

update the favicons and add recommended items to public folder

2015-02-02 16:23:24 -08:00

c7979f1c69945c59.html

add simply hired page

2015-05-22 12:57:43 -07:00

favicon.ico

start adding new favicons and make the seed task run with each push to heroku

2015-02-02 15:27:12 -08:00

favicons.html

update the favicons and add recommended items to public folder

2015-02-02 16:23:24 -08:00

robots.txt

SEO improvements suggested by Mark

2014-11-23 15:08:46 -06:00