now working with require
Merge branch 'master' of github.com:incoqnito/application

Conflicts:
	.gitignore
	assets/application.json
	bower.json
	config.rb
	css/font-awesome.min.css
	css/style.css
	index.html
	js/app/app.js
	js/app/controllers/ApplicationController.js
	js/app/controllers/CurriculumController.js
	js/app/controllers/IndexController.js
	js/app/controllers/SkillPageController.js
	js/app/routes.js
	js/app/services/DataService.js
	sass/style.scss
	views/_partials/header.html
	views/_partials/navigation.html
	views/skill-page.html
	web-server.js