some changes to make it compile on parallella
fix make conflict
Merge branch 'master' of github.com:Buurlage-Wits/epiphany-bsp
code now runs, need to fix linking schema
Merge branch 'master' of github.com:Buurlage-Wits/epiphany-bsp