changes trying out api
yuk
aargh
 DAMN MERGE
 antoeherzdkjfljasdfgjd
fuck ths shit
merge test
commit
duh
 gasdf
pasted dev code
update to html/css
fixing css, html
working on api
changes
updates to tab section
Merge branch 'dev' into mags
merge testing
merge testing
changes for merging'