Airplane JS chart rendering statically
Conflicts resolved
JS chart now dynamic from form
Conflict fix
Merge branch 'joshricha-master'