pulled Development
back to square one
update
timer finally working
updated
merge resolved
Merge branch 'Development' into listview
changes to timeleft
updated
Merge branch 'Development' of https://github.com/cgunarto/CAPSL into Development
merge resolved
updated
Merge branch 'Development' of https://github.com/cgunarto/CAPSL into Development
Merge branch 'Development' into listview
updated
updated
Merge branch 'Development' of https://github.com/cgunarto/CAPSL into Development
Merge branch 'Development' into listview
updated
Merge branch 'Development' into capture_new