commiting
Merge branch 'master' of github.com:darkstiffler/hs_new
minor changes
fixed conflicts
add map placeholder