Newline
Merge branch 'master' of http://github.com/stuycs-softdev/proj1-6
Merge branch 'master' of http://github.com/stuycs-softdev/proj1-6
Merge branch 'master' of http://github.com/stuycs-softdev/proj1-6
Merge branch 'master' of http://github.com/stuycs-softdev/proj1-6
Merge branch 'master' of http://github.com/stuycs-softdev/proj1-6
Merge branch 'master' of http://github.com/stuycs-softdev/proj1-6
Added index.html
Added jinja code