mike commit
 dev merge
sm
merge conflicts
Ajax functions
 function stuff