fixing merge conflict
Merging in new features from master
added module and controller for nav but needs to be refined
removed jquery from showExamples
nav no longer gets active class added by $(<element>) and is generated in agular
removed all bootstrap scripts. implemented tooltips with angular-bootstrap
committing before the end of the day
Merge branch 'master' of https://github.com/GraphAlchemist/Alchemy into ifj_landing
added pretty print directive to examples
nav bar now hides when example three is started
Merge pull request #197 from ifjorissen/ifj_landing

Examples and angular