Initial commit
Merge origin/master
Finished hackaton milestone