commited some stuff
Merge branch 'master' of github.com:vcrazy/project-7
Merge branch 'master' of github.com:vcrazy/project-7
added some functions