updated main.js#2

Open

carvelhallndi wants to merge 2 commits intojackfranklin:masterfrom

carvelhallndi:master

Commits on May 1, 2016

updated main.js
Carvel
committed

Commits on May 2, 2016

https://jira.netdes.com/browse/DRS-1037 - added jspm es6 support and a barebones page is now being rendered using the jspm/es6 module technology
carvelhallndi
committed