First commit
Merge github.com:paranoid-and-roid/angular_shots