Adding sample dependencies in JSON
Merge branch 'master' of https://github.com/leya7/hackfmi2013
Merge branch 'master' of https://github.com/leya7/hackfmi2013
Merge pull request #7 from alehander42/master

Fix aliases
Added method to fetch all majors names
* Added all properties of the Majors to the model
* Removed redundant log
Merge branch 'master' of https://github.com/MayaLekova/hackfmi2013

Conflicts:
	js/main.js
styling, majors dropdown
* Removed redundant timeout
Merge branch 'master' of https://github.com/leya7/hackfmi2013

Conflicts:
	index.html
	js/main.js
Merge pull request #8 from MayaLekova/master

Added method to fetch all majors names
styled canvas
fixes
fix
fix
rename
* Fixed switched names of functions. Removed ghostly getMajor function
Merge pull request #9 from MayaLekova/master

Pull the fixed fixes please :)
* Added sidebar with name and description for the selected subject
* Fix the JSON result for both Chrome and Firefox (from Peshe)
Merge pull request #10 from MayaLekova/master

Added sidebar with info