moved things to server
Merge branch 'master' of https://github.com/lindalli/bigred

"merging with Lyndau"
Merge branch 'master' of https://github.com/lindalli/bigred

merging with aizhan