Merge pull request #24 from AADOJ/Sisso

Sisso
Revert "Sisso"
Merge pull request #25 from AADOJ/revert-24-Sisso

Revert "Sisso"
UI slot occupied and post method for array added
Worked on spark function for recieving and responding
Merge branch 'OMAR' of github.com:AADOJ/Late-Term-Assignment into GGJ
Moved html and js files to correct folder
Changed main class to web ui
fuu
Merge branch 'master' into develop
API and GUI ready!!! for testing!!!
conflict fixed
Merge pull request #38 from AADOJ/OMAR

Omar
Merge pull request #39 from AADOJ/develop

Develop
Added heroku setting to build.gradle and system.properties
Added heroku setting to Procfile
bugs in gui fixed
Auto merge
Merge branch 'master' of github.com:AADOJ/Late-Term-Assignment
Changed install location dir for installApp task