init
Hello
dded pic
lol
Merge branch 'master' of heroku.com:norboglir

Conflicts:
	node_modules/.bin/express
	node_modules/express/bin/express
	node_modules/express/node_modules/connect/lib/public/icons/page.png
	node_modules/express/node_modules/connect/lib/public/icons/page_add.png
	node_modules/express/node_modules/connect/lib/public/icons/page_attach.png
	node_modules/express/node_modules/connect/lib/public/icons/page_code.png
	node_modules/express/node_modules/connect/lib/public/icons/page_copy.png
	node_modules/express/node_modules/connect/lib/public/icons/page_delete.png
	node_modules/express/node_modules/connect/lib/public/icons/page_edit.png
	node_modules/express/node_modules/connect/lib/public/icons/page_error.png
	node_modules/express/node_modules/connect/lib/public/icons/page_excel.png
	node_modules/express/node_modules/connect/lib/public/icons/page_find.png
	node_modules/express/node_modules/connect/lib/public/icons/page_gear.png
	node_modules/express/node_modules/connect/lib/public/icons/page_go.png
	node_modules/express/node_modules/connect/lib/public/icons/page_green.png
	node_modules/express/node_modules/connect/lib/public/icons/page_key.png
	node_modules/express/node_modules/connect/lib/public/icons/page_lightning.png
	node_modules/express/node_modules/connect/lib/public/icons/page_link.png
	node_modules/express/node_modules/connect/lib/public/icons/page_paintbrush.png
	node_modules/express/node_modules/connect/lib/public/icons/page_paste.png
	node_modules/express/node_modules/connect/lib/public/icons/page_red.png
	node_modules/express/node_modules/connect/lib/public/icons/page_refresh.png

	node_modules/express/node_modules/connect/lib/public/icons/page_save.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_acrobat.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_actionscript.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_add.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_c.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_camera.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_cd.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_code.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_code_red.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_coldfusion.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_compressed.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_copy.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_cplusplus.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_csharp.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_cup.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_database.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_delete.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_dvd.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_edit.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_error.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_excel.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_find.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_flash.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_freehand.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_gear.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_get.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_go.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_h.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_horizontal.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_key.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_lightning.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_link.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_magnify.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_medal.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_office.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_paint.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_paintbrush.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_paste.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_php.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_picture.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_powerpoint.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_put.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_ruby.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_stack.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_star.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_swoosh.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_text.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_text_width.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_tux.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_vector.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_visualstudio.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_width.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_word.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_world.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_wrench.png
	node_modules/express/node_modules/connect/lib/public/icons/page_white_zip.png
	node_modules/express/node_modules/connect/lib/public/icons/page_word.png
	node_modules/express/node_modules/connect/lib/public/icons/page_world.png
	node_modules/express/node_modules/connect/node_modules/formidable/test/run.js
	web.js