Initial commit
Merge branch 'master' of https://github.com/Velascodelaguna/tech-evaluation

Conflicts:
	.gitignore
created a new xml to list all the framework comparisons with play and have added the play with django with citations
Add comparisons tab for framework comparison
- controller renders comparisonpage
- views dont have info class so won't render play icon bullet points
- navigation tab has Comparison
- routes link to comparison page
Merge branch 'unstable'
Add padding to right side of paragraphs - improves readability
Merge branch 'unstable'
adding completed framework comparison xml
Merge branch 'unstable' into deployment
Forgot to close tag
Add start.sh
Merge branch 'deployment' of csil-git1.cs.surrey.sfu.ca:jvelasco/tech-evaluation into deployment
Prepending /group14 to routes so it can be routed properly by apache