update img showing of adding myProgram
fix merge conflict
update XML file
merge new update
modify info pop's position & transition
Merge branch 'master' of https://github.com/NetDBNCKU/Conference-Web-App
pull from remote
change info dialog style
media qeury for info page
extend info div width for device
modify index btn's text margin and size (media query)
modify index page img's margin-top
update xml file for changing author's name
xml file compare with name of author in paper which author submitted
XML file update maybe last time...
merge from origin
modify xml author name format
merge from develop2
merge from heroku branch
modify chair of program