new file:   .gitignore
modified:   sim_dashboard/settings.py
modified:   sim_dashboard/urls.py
modified:   static/js/my_raphael.js
new file:   static/js/result_manager/index.js
new file:   templates/result_manager/index.html
new file:   result_manager/__init__.py
new file:   result_manager/admin.py
new file:   result_manager/models.py
new file:   result_manager/tests.py
new file:   result_manager/views.py
Merge branch 'master' of https://github.com/koh1/sim_ds

Conflicts:
	sim_dashboard/urls.py

modified:   main/views.py
modified:   nwk_vis/views.py
modified:   sim_dashboard/urls.py