feature validator
init scaffolding
init scaffolding
complete validator
merge validator
complete validator
Merge branch 'develop' of /Users/Amrio/Documents/GitHub/git-repo/example into develop
feature validator
complete validator
Merge commit '0a2ef7751ad68353c2bd0b77d647380476a036a7' into develop
update karma-jasmine-plugin to ^0.2.0
modify specs to appropriate
Revert "init"

This reverts commit a10b3628fa391c25b4649ac87a655ebcd555b072.
Merge branch 'develop'

Conflicts:
	index.html
	js/amrio/misc/Classes.js
Merge branch 'master' of https://github.com/amriogit/example

Conflicts:
	package.json