First commit
Testing gitmerge
Finished testing gitmerge
Added api file
api 2to3
Added urls and template views
Rename api.py to jsonapi.py
Added test method
More testing
WTF?
WTF??
Fix derp
I am sorry python
Try to fix tab error
Try to fix tab error step 2
Fix tab error
derped, fix jsonapi.py's tab error
Remove test code to fix IndentationError
Try to fix TypeError
Try to fix TypeError

Added blank salt argument