refactor header
Merge pull request #5 from benkyet/refactor/header

refactor header with fb-login
Merge pull request #1 from benkyet/master

wrong flow
oo
Merge branch 'master' of github.com:Jamiltz/website

Conflicts:
	dev/src/app/account/account.js
	dev/src/app/app.js
	dev/src/app/signup/signup.js
fix templateUrl
Merge pull request #7 from Jamiltz/fix/templateUrl

Fix/template url
add router for wizard and FB.api method in home.js
user friend list and education history w/ FB.api
search feature for step2 of wizard
add checkbox in ng-repeat - wizard logic done
Merge branch 'master' of github.com:benkyet/website

Conflicts:
	dev/src/app/account/account.js
	src/app/account/account.js
<< git rm -r --cached ./dev >>
Merge pull request #9 from Jamiltz/master

<< git rm -r --cached ./dev >>
Merge pull request #10 from Jamiltz/refactor/style-for-wizard-flow

refactor/homepage-with-bs3.0
refactor/homepage-with-bs3.0
Merge pull request #11 from Jamiltz/refactor/style-for-wizard-flow

fix/grunt compile on local machine
fix/grunt compile on local machine
Merge pull request #12 from Jamiltz/refactor/style-for-wizard-flow

restyle of home page w/ bs 3.0
restyle of home page w/ bs 3.0