changes trying out api
yuk
aargh
 DAMN MERGE
 antoeherzdkjfljasdfgjd
fuck ths shit
 sdf
commit
duh
 gasdf
pasted dev code
New layout
fixing css, html
sdfa
 sdf
dev merge good
working on api
 new changes
changes
Merge branch 'dev' into mags